From c405a84572e70093617ba23a5d5dd4edd61533f7 Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli>
Date: Wed, 16 Aug 2006 00:07:06 +0000
Subject: [PATCH] Force usage of common gbfile api.

---
 tmpro.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/tmpro.c b/tmpro.c
index a0b3018db..ee632250e 100644
--- a/tmpro.c
+++ b/tmpro.c
@@ -38,32 +38,31 @@
 
 #define MYNAME	"TMPro"
 
-static FILE *file_in;
-static FILE *file_out;
+static gbfile *file_in, *file_out;
 static short_handle mkshort_handle;
 
 static void 
 rd_init(const char *fname)
 {
-    file_in = xfopen(fname, "rb", MYNAME);
+    file_in = gbfopen(fname, "rb", MYNAME);
 }
 
 static void 
 rd_deinit(void)
 {
-    fclose(file_in);
+    gbfclose(file_in);
 }
 
 static void 
 wr_init(const char *fname)
 {
-    file_out = xfopen(fname, "w", MYNAME);
+    file_out = gbfopen(fname, "w", MYNAME);
 }
 
 static void 
 wr_deinit(void)
 {
-    fclose(file_out);
+    gbfclose(file_out);
 }
 
 static void 
@@ -75,11 +74,8 @@ data_read(void)
     waypoint *wpt_tmp;
     int i;
     int linecount = 0;
-    textfile_t *tin;
     
-    tin = textfile_init(file_in);
-    
-    while ((buff = textfile_read(tin))) {
+    while ((buff = gbfgetstr(file_in))) {
         linecount++;
 
 	/* skip the line if it contains "sHyperLink" as it is a header (I hope :) */
@@ -172,7 +168,6 @@ data_read(void)
 	}
 
     }
-    textfile_done(tin);
 }
 
 static void 
@@ -212,7 +207,7 @@ tmpro_waypt_pr(const waypoint * wpt)
 	/* Number of characters */
     /*  25    6      80         8    8      8         8       8    4       4       128      */
     
-    fprintf(file_out, "new\t%.6s\t%.80s\t%08.6f\t%08.6f\t\t\t%.2f\t%d\t%d\t%.128s\n",
+    gbfprintf(file_out, "new\t%.6s\t%.80s\t%08.6f\t%08.6f\t\t\t%.2f\t%d\t%d\t%.128s\n",
     	shortname,
     	description,
 	    wpt->latitude,
@@ -242,7 +237,7 @@ data_write(void)
     }
     
 	/* Write file header */
-	fprintf(file_out, "Group\tsID\tsDescription\tfLat\tfLong\tfEasting\tfNorthing\tfAlt\tiColour\tiSymbol\tsHyperLink\n");
+	gbfprintf(file_out, "Group\tsID\tsDescription\tfLat\tfLong\tfEasting\tfNorthing\tfAlt\tiColour\tiSymbol\tsHyperLink\n");
 
     waypt_disp_all(tmpro_waypt_pr);
     mkshort_del_handle(&mkshort_handle);
-- 
2.30.2